Implement keynav for the color picker - win32 too. Fixes bug #160437.

2004-12-06  Hans Breuer  <hans@breuer.org>

	* gtk/gtkcolorsel.c (key_press): Implement keynav for the color
	picker - win32 too. Fixes bug #160437.

diff --git a/ChangeLog b/ChangeLog
index e6e8a9e9a2d014e9ee4f90f4d2cacc67230d0829..b5520afdaee3afea0a8294278524df678f14620c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-06  Hans Breuer  <hans@breuer.org>
+
+       * gtk/gtkcolorsel.c (key_press): Implement keynav for the color
+       picker - win32 too. Fixes bug #160437.
+
 2004-12-05  Tor Lillqvist  <tml@iki.fi>
 
        * demos/gtk-demo/main.c (load_file): Use g_fopen().

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e6e8a9e9a2d014e9ee4f90f4d2cacc67230d0829..b5520afdaee3afea0a8294278524df678f14620c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-12-06  Hans Breuer  <hans@breuer.org>
+
+       * gtk/gtkcolorsel.c (key_press): Implement keynav for the color
+       picker - win32 too. Fixes bug #160437.
+
 2004-12-05  Tor Lillqvist  <tml@iki.fi>
 
        * demos/gtk-demo/main.c (load_file): Use g_fopen().

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e6e8a9e9a2d014e9ee4f90f4d2cacc67230d0829..b5520afdaee3afea0a8294278524df678f14620c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-12-06  Hans Breuer  <hans@breuer.org>
+
+       * gtk/gtkcolorsel.c (key_press): Implement keynav for the color
+       picker - win32 too. Fixes bug #160437.
+
 2004-12-05  Tor Lillqvist  <tml@iki.fi>
 
        * demos/gtk-demo/main.c (load_file): Use g_fopen().

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e6e8a9e9a2d014e9ee4f90f4d2cacc67230d0829..b5520afdaee3afea0a8294278524df678f14620c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-12-06  Hans Breuer  <hans@breuer.org>
+
+       * gtk/gtkcolorsel.c (key_press): Implement keynav for the color
+       picker - win32 too. Fixes bug #160437.
+
 2004-12-05  Tor Lillqvist  <tml@iki.fi>
 
        * demos/gtk-demo/main.c (load_file): Use g_fopen().

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index ac171a9eebb47db4b5d486deaebada0e5d6098de..cb9006bb5507640a0104936bae16f47428b1d20f 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -66,6 +66,9 @@
 #ifdef GDK_WINDOWING_X11
 #include <X11/Xlib.h>
 #include "x11/gdkx.h"
+#elif defined GDK_WINDOWING_WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #endif
 
 /* Number of elements in the custom palatte */
@@ -1311,7 +1314,7 @@ key_press (GtkWidget   *invisible,
       
       return TRUE;
 
-#ifdef GDK_WINDOWING_X11
+#if defined GDK_WINDOWING_X11 || defined GDK_WINDOWING_WIN32
     case GDK_Up:
     case GDK_KP_Up:
       dy = state == GDK_MOD1_MASK ? -BIG_STEP : -1;
@@ -1340,6 +1343,12 @@ key_press (GtkWidget   *invisible,
 #ifdef GDK_WINDOWING_X11
   XWarpPointer (gdk_x11_display_get_xdisplay (display),
                None, None, 0, 0, 0, 0, dx, dy);
+#elif defined GDK_WINDOWING_WIN32
+  {
+    POINT point;
+    if (GetCursorPos (&point))
+      SetCursorPos (point.x + dx, point.y + dy);
+  }
 #endif
   
   return TRUE;